Move working tests to new directory

These are tests that are working on both GL and Cairo now.

Some tests got black boxes over the areas that aren't easy to compare.

diff --git a/testsuite/gsk/compare/clipped_rounded_clip.node b/testsuite/gsk/compare/clipped_rounded_clip.node
new file mode 100644 (file)
index 0000000..0d1340e
--- /dev/null
+++ b/testsuite/gsk/compare/clipped_rounded_clip.node
@@ -0,0 +1,41 @@
+color {
+  color: white;
+  bounds: 50 70 80 90;
+}
+
+clip {
+  clip: 60 80 60 70;
+  child: rounded-clip {
+    clip: 20 50 100 100 / 50;
+    child: color {
+      bounds: 20 50 100 100;
+      color: red;
+    }
+  }
+}
+
+debug {
+  message: "clipped out area";
+  child: container {
+    color {
+      bounds: 115 80 5 45;
+      color: black;
+    }
+    color {
+      bounds: 110 121 5 11;
+      color: black;
+    }
+    color {
+      bounds: 99 129 11 11;
+      color: black;
+    }
+    color {
+      bounds: 91 140 11 5;
+      color: black;
+    }
+    color {
+      bounds: 60 145 35 5;
+      color: black;
+    }
+  }
+}

diff --git a/testsuite/gsk/compare/clipped_rounded_clip.png b/testsuite/gsk/compare/clipped_rounded_clip.png
new file mode 100644 (file)
index 0000000..61f527f
Binary files /dev/null and b/testsuite/gsk/compare/clipped_rounded_clip.png differ

diff --git a/testsuite/gsk/compare/opacity_clip.node b/testsuite/gsk/compare/opacity_clip.node
new file mode 100644 (file)
index 0000000..443b1e9
--- /dev/null
+++ b/testsuite/gsk/compare/opacity_clip.node
@@ -0,0 +1,36 @@
+color {
+  bounds: 40 40 70 70;
+  color: transparent;
+}
+
+clip {
+  clip: 50 50 50 50;
+  child: opacity {
+    opacity: 0.4;
+    child: rounded-clip {
+      clip: 50 50 100 100 / 50;
+      child: color {
+        bounds: 50 50 100 100;
+        color: red;
+      }
+    }
+  }
+}
+
+debug {
+  message: "clipped out area";
+  child: container {
+    color {
+      bounds: 50 70 10 30;
+      color: black;
+    }
+    color {
+      bounds: 55 55 20 20;
+      color: black;
+    }
+    color {
+      bounds: 70 50 30 10;
+      color: black;
+    }
+  }
+}

diff --git a/testsuite/gsk/compare/opacity_clip.png b/testsuite/gsk/compare/opacity_clip.png
new file mode 100644 (file)
index 0000000..f64cab7
Binary files /dev/null and b/testsuite/gsk/compare/opacity_clip.png differ

diff --git a/testsuite/gsk/compare/outset_shadow_offset_both.node b/testsuite/gsk/compare/outset_shadow_offset_both.node
new file mode 100644 (file)
index 0000000..1e05bc4
--- /dev/null
+++ b/testsuite/gsk/compare/outset_shadow_offset_both.node
@@ -0,0 +1,8 @@
+outset-shadow {
+  outline: 100 100 100 100;
+  color: black;
+  dx: -100;
+  dy: 100;
+  spread: 10;
+  blur: 0;
+}

diff --git a/testsuite/gsk/compare/outset_shadow_offset_both.png b/testsuite/gsk/compare/outset_shadow_offset_both.png
new file mode 100644 (file)
index 0000000..5bb7830
Binary files /dev/null and b/testsuite/gsk/compare/outset_shadow_offset_both.png differ

diff --git a/testsuite/gsk/compare/outset_shadow_offset_x.node b/testsuite/gsk/compare/outset_shadow_offset_x.node
new file mode 100644 (file)
index 0000000..f78d0b4
--- /dev/null
+++ b/testsuite/gsk/compare/outset_shadow_offset_x.node
@@ -0,0 +1,8 @@
+outset-shadow {
+  outline: 100 100 100 100;
+  color: black;
+  dx: 10;
+  dy: 0;
+  spread: 10;
+  blur: 0;
+}

diff --git a/testsuite/gsk/compare/outset_shadow_offset_x.png b/testsuite/gsk/compare/outset_shadow_offset_x.png
new file mode 100644 (file)
index 0000000..7ae6367
Binary files /dev/null and b/testsuite/gsk/compare/outset_shadow_offset_x.png differ

diff --git a/testsuite/gsk/compare/outset_shadow_offset_y.node b/testsuite/gsk/compare/outset_shadow_offset_y.node
new file mode 100644 (file)
index 0000000..91fb1a7
--- /dev/null
+++ b/testsuite/gsk/compare/outset_shadow_offset_y.node
@@ -0,0 +1,8 @@
+outset-shadow {
+  outline: 100 100 100 100;
+  color: black;
+  dx: 0;
+  dy: 10;
+  spread: 10;
+  blur: 0;
+}

diff --git a/testsuite/gsk/compare/outset_shadow_offset_y.png b/testsuite/gsk/compare/outset_shadow_offset_y.png
new file mode 100644 (file)
index 0000000..2a8bd74
Binary files /dev/null and b/testsuite/gsk/compare/outset_shadow_offset_y.png differ

diff --git a/testsuite/gsk/compare/outset_shadow_rounded_top.node b/testsuite/gsk/compare/outset_shadow_rounded_top.node
new file mode 100644 (file)
index 0000000..8259016
--- /dev/null
+++ b/testsuite/gsk/compare/outset_shadow_rounded_top.node
@@ -0,0 +1,8 @@
+outset-shadow {
+  outline: 100 100 200 200 / 7 7 0 0;
+  color: black;
+  dx: 0;
+  dy: 0;
+  spread: 1;
+  blur: 0;
+}

diff --git a/testsuite/gsk/compare/outset_shadow_rounded_top.png b/testsuite/gsk/compare/outset_shadow_rounded_top.png
new file mode 100644 (file)
index 0000000..d6ac63d
Binary files /dev/null and b/testsuite/gsk/compare/outset_shadow_rounded_top.png differ

diff --git a/testsuite/gsk/compare/outset_shadow_simple.node b/testsuite/gsk/compare/outset_shadow_simple.node
new file mode 100644 (file)
index 0000000..45bc272
--- /dev/null
+++ b/testsuite/gsk/compare/outset_shadow_simple.node
@@ -0,0 +1,8 @@
+outset-shadow {
+  outline: 100 100 100 100;
+  color: black;
+  dx: 0;
+  dy: 0;
+  spread: 10;
+  blur: 0;
+}

diff --git a/testsuite/gsk/compare/outset_shadow_simple.png b/testsuite/gsk/compare/outset_shadow_simple.png
new file mode 100644 (file)
index 0000000..87c691c
Binary files /dev/null and b/testsuite/gsk/compare/outset_shadow_simple.png differ

diff --git a/testsuite/gsk/gl/clipped_rounded_clip.gl.png b/testsuite/gsk/gl/clipped_rounded_clip.gl.png
deleted file mode 100644 (file)
index 0e8b85b..0000000
Binary files a/testsuite/gsk/gl/clipped_rounded_clip.gl.png and /dev/null differ

diff --git a/testsuite/gsk/gl/clipped_rounded_clip.txt b/testsuite/gsk/gl/clipped_rounded_clip.txt
deleted file mode 100644 (file)
index 545e604..0000000
--- a/testsuite/gsk/gl/clipped_rounded_clip.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-clip {
-  clip: 60 80 60 70;
-  child: rounded-clip {
-    clip: 20 50 100 100 / 50;
-    child: color {
-      bounds: 20 50 100 100;
-      color: red;
-    }
-  }
-}

diff --git a/testsuite/gsk/gl/opacity_clip.gl.png b/testsuite/gsk/gl/opacity_clip.gl.png
deleted file mode 100644 (file)
index 95df90f..0000000
Binary files a/testsuite/gsk/gl/opacity_clip.gl.png and /dev/null differ

diff --git a/testsuite/gsk/gl/opacity_clip.txt b/testsuite/gsk/gl/opacity_clip.txt
deleted file mode 100644 (file)
index 8b9991f..0000000
--- a/testsuite/gsk/gl/opacity_clip.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-clip {
-  clip: 50 50 50 50;
-  child: opacity {
-    opacity: 0.4;
-    child: rounded-clip {
-      clip: 50 50 100 100 / 50;
-      child: color {
-        bounds: 50 50 100 100;
-        color: red;
-      }
-    }
-  }
-}

diff --git a/testsuite/gsk/gl/outset_shadow_offset_both.gl.png b/testsuite/gsk/gl/outset_shadow_offset_both.gl.png
deleted file mode 100644 (file)
index 5bb7830..0000000
Binary files a/testsuite/gsk/gl/outset_shadow_offset_both.gl.png and /dev/null differ

diff --git a/testsuite/gsk/gl/outset_shadow_offset_both.txt b/testsuite/gsk/gl/outset_shadow_offset_both.txt
deleted file mode 100644 (file)
index 1e05bc4..0000000
--- a/testsuite/gsk/gl/outset_shadow_offset_both.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-outset-shadow {
-  outline: 100 100 100 100;
-  color: black;
-  dx: -100;
-  dy: 100;
-  spread: 10;
-  blur: 0;
-}

diff --git a/testsuite/gsk/gl/outset_shadow_offsetx.gl.png b/testsuite/gsk/gl/outset_shadow_offsetx.gl.png
deleted file mode 100644 (file)
index 7ae6367..0000000
Binary files a/testsuite/gsk/gl/outset_shadow_offsetx.gl.png and /dev/null differ

diff --git a/testsuite/gsk/gl/outset_shadow_offsetx.txt b/testsuite/gsk/gl/outset_shadow_offsetx.txt
deleted file mode 100644 (file)
index f78d0b4..0000000
--- a/testsuite/gsk/gl/outset_shadow_offsetx.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-outset-shadow {
-  outline: 100 100 100 100;
-  color: black;
-  dx: 10;
-  dy: 0;
-  spread: 10;
-  blur: 0;
-}

diff --git a/testsuite/gsk/gl/outset_shadow_offsety.gl.png b/testsuite/gsk/gl/outset_shadow_offsety.gl.png
deleted file mode 100644 (file)
index 2a8bd74..0000000
Binary files a/testsuite/gsk/gl/outset_shadow_offsety.gl.png and /dev/null differ

diff --git a/testsuite/gsk/gl/outset_shadow_offsety.txt b/testsuite/gsk/gl/outset_shadow_offsety.txt
deleted file mode 100644 (file)
index 91fb1a7..0000000
--- a/testsuite/gsk/gl/outset_shadow_offsety.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-outset-shadow {
-  outline: 100 100 100 100;
-  color: black;
-  dx: 0;
-  dy: 10;
-  spread: 10;
-  blur: 0;
-}

diff --git a/testsuite/gsk/gl/outset_shadow_rounded_top.gl.png b/testsuite/gsk/gl/outset_shadow_rounded_top.gl.png
deleted file mode 100644 (file)
index d6ac63d..0000000
Binary files a/testsuite/gsk/gl/outset_shadow_rounded_top.gl.png and /dev/null differ

diff --git a/testsuite/gsk/gl/outset_shadow_rounded_top.txt b/testsuite/gsk/gl/outset_shadow_rounded_top.txt
deleted file mode 100644 (file)
index 8259016..0000000
--- a/testsuite/gsk/gl/outset_shadow_rounded_top.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-outset-shadow {
-  outline: 100 100 200 200 / 7 7 0 0;
-  color: black;
-  dx: 0;
-  dy: 0;
-  spread: 1;
-  blur: 0;
-}

diff --git a/testsuite/gsk/gl/outset_shadow_simple.gl.png b/testsuite/gsk/gl/outset_shadow_simple.gl.png
deleted file mode 100644 (file)
index 87c691c..0000000
Binary files a/testsuite/gsk/gl/outset_shadow_simple.gl.png and /dev/null differ

diff --git a/testsuite/gsk/gl/outset_shadow_simple.txt b/testsuite/gsk/gl/outset_shadow_simple.txt
deleted file mode 100644 (file)
index 45bc272..0000000
--- a/testsuite/gsk/gl/outset_shadow_simple.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-outset-shadow {
-  outline: 100 100 100 100;
-  color: black;
-  dx: 0;
-  dy: 0;
-  spread: 10;
-  blur: 0;
-}

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 6b74e1c144dd1f9eee25388173e64181e903cf53..e9fd91376448d3eb8f8e7c442daf5aa0fcce4e3c 100644 (file)
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -40,21 +40,14 @@ test('nodes (cairo)', test_render_nodes,
 
 # Interesting render nodes proven to be rendered 'correctly' by the GL renderer.
 gl_tests = [
-  ['outset shadow simple',         'outset_shadow_simple'],
-  ['outset shadow offset x',       'outset_shadow_offsetx'],
-  ['outset shadow offset y',       'outset_shadow_offsety'],
-  ['outset shadow offset both',    'outset_shadow_offset_both'],
   ['outset shadow rounded1',       'outset_shadow_rounded1'],
   ['outset shadow rounded2',       'outset_shadow_rounded2'],
-  ['outset shadow rounded top',    'outset_shadow_rounded_top'],
   ['outset shadow blurred simple', 'outset_shadow_blurred_simple'],
   ['outset shadow blurred small',  'outset_shadow_blurred_small'],
   ['outset shadow blurred offset', 'outset_shadow_blurred_offset'],
   ['Crossfade simple',             'cross_fade'],
-  ['Clipped rounded clip',         'clipped_rounded_clip'],
   ['gradient simple',              'gradient_simple'],
   ['gradient clipped',             'gradient_clipped'],
-  ['offscreen opacity',            'opacity_clip'],
 ]
 
 foreach gl_test : gl_tests
@@ -72,6 +65,38 @@ foreach gl_test : gl_tests
        suite: 'gsk')
 endforeach
 
+compare_render_tests = [
+  'clipped_rounded_clip',
+  'opacity_clip',
+  'outset_shadow_offset_both',
+  'outset_shadow_offset_x',
+  'outset_shadow_offset_y',
+  'outset_shadow_rounded_top',
+  'outset_shadow_simple',
+]
+
+renderers = [
+  'opengl',
+  'cairo',
+]
+
+foreach renderer : renderers
+  foreach test : compare_render_tests
+    test(renderer + ' ' + test, compare_render,
+         args: [join_paths(meson.current_source_dir(), 'compare', test + '.node'),
+                join_paths(meson.current_source_dir(), 'compare', test + '.png')],
+         env: [ 'GIO_USE_VOLUME_MONITOR=unix',
+                'GSETTINGS_BACKEND=memory',
+                'GTK_CSD=1',
+                'G_ENABLE_DIAGNOSTIC=0',
+                'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
+                'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+                'GSK_RENDERER=' + renderer
+              ],
+       suite: [ 'gsk', 'gsk-compare', 'gsk-' + renderer, 'gsk-compare-' + renderer ])
+  endforeach
+endforeach
+
 node_parser_tests = [
   'crash1',
   'crash2',